Merge s-mpr-2022-01-05

Change-Id: Icb2bb00751ffc67b3bdb56e5babf14347a0ecda5
tree: 456dda17311a101990cdfd372217969af1a56e8b
  1. Settings/
  2. TwoPanelSettingsLib/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg