Android mainline 11.0.0 release 4
Snap for 6981242 from 0bf2df681092be4d4fd192c45ab730bcd7d1a919 to mainline-release

Change-Id: I9778253c5dfec52fa17a7922a3baca88674ef842