Merge 921a9fbb3b29a58b998958acbcd1253d316f3841 on remote branch

Change-Id: I1a685981736de9fb9a0d57f0699123d7f462763b
tree: b59e600e8cfe2289b5ad174b0fda815042ba1feb
  1. Settings/
  2. TwoPanelSettingsLib/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg