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

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

Change-Id: I11a56ed8d67f321a66fecc7550383db7d9f9c897
tree: 7ea7cfa91514532b3e8707c6c8f9b9b042073c2a
  1. core/
  2. services/
  3. wifi/