Android mainline 11.0.0 release 15
Snap for 7132927 from 0f5974b7c5193e9024f9f59709723a2e998407ea to mainline-extservices-release

Change-Id: I0cf06c4170c0df3e738ac4abfd4d7668751ec4b8