Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c

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

Change-Id: Ifa30f9611612523077a2b0c1c919e5035f5cd8e0
tree: 81d53185d5b5538f0969ff4c20e97d1261a8a745
  1. core/
  2. packages/
  3. services/
  4. wifi/