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

Change-Id: Idf1ab0f6a2028a1e41c52f6269ec05a9f1e87ec5