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

Change-Id: Iba0e83f72931509331bd48fe85597c10ceec240e