Merge mpr-2021-11-05

Change-Id: I0fd726f72bc423de18aaa1fe1b93c8cab92817ef
tree: 5155a011d5dbc1f47762bb830ccbcd025616d04c
  1. Settings/
  2. TwoPanelSettingsLib/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg