Merge "Do not generate greylist if UNSAFE_DISABLE_HIDDENAPI_FLAGS=true" am: f9ec508556
am: 942dedc59c

Change-Id: I17dc3064c3205ac16a92553f59947e12a7d51b77