Snap for 7277907 from 3ade81c3c8930c30ecb8dac2f360b9177a9a1317 to mainline-permission-release

Change-Id: I9e65353556cba41ad3d9f8a9b55437d9b034721f