Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

Bug: 205056467
Merged-In: I9d19cb468db1eba6f4626edba7461e8033331403
Change-Id: I8250331c655c8253f94d5340091b4aff4a854438
tree: 04cad94f13296cf8790b34788936adff6cd02791
  1. android-5.10/
  2. android-5.4/
  3. android-mainline/