Merge "Use bionic's autogenerated whitelist policy" am: dcd14de5f6
am: 82c92f94bf

Change-Id: I2995ab46372e10db9f879c359ead1ccbef9b45ae