Merge SP1A.211105.004 to aosp-master - DO NOT MERGE

Merged-In: I7e267e3c046d726750180efa81806cbbefb17b68
Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: Ic3cd62083de4219dbf52f568ca4f34bdc7a08516
tree: 42a7a3e89cf614fd09d9a503964f3fb0838cf06f
  1. framework/
  2. service/