Merge changes I0faeda20,I726e74f5 am: c6a61f9eee

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

Change-Id: I2adf488439c8aecf2d3dac2438b848bbdc868a21
tree: fb79cd73bb1b34363adb263d0148ebcb5cb0d44b
  1. core/
  2. packages/
  3. services/
  4. wifi/