Adds additional information about custom flavors and private flavors

Change-Id: I144f441406c80ad2248f52668ebe8ff08f87650a
Merge "Adds additional information about custom flavors and private flavors"