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

Change-Id: I459e7bb01b0b72c792b8af621331a2e43718fc9e