Android mainline 11.0.0 release 45
Merge cherrypicks of [16018191, 16018192, 16017196] into mainline-release

Change-Id: I5d1e3cea37a2d9773e78046517abf9036e084b9c