[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: efafd46947 -s ours

am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1158b1e4f70b018504c963a76782c8773f698118
tree: dba10b874e9f7be76679046c76599422791e34a0
  1. core/
  2. services/
  3. wifi/