Merge mainline-release 6664920 to master - DO NOT MERGE am: 4c6dc6bbea

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

Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
tree: 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be
  1. core/
  2. packages/
  3. services/
  4. wifi/