Merge Android10 QPR1 into AOSP master
am: 5a13c691f5

Change-Id: I08911c7ee5cd78f3293680a8c0e41fc05120d835
tree: 54538fab1c079872ca82adbcf274e19fdf562be6
  1. service/
  2. PREUPLOAD.cfg