Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 07cfc92259 am: 24d691f04d am: 10656c3c44 am: bff31f6f47

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

Change-Id: I2c5895c223a5843cfe11a1736a243b6847ad1b9a
tree: 78ae56bea88fa12692714dd69588ce38b9f735ad
  1. core/
  2. services/
  3. wifi/