Merge changes I982543cd,I41c3bf6c,Id3e5f6e1 am: 4fe79a3ff9 am: db7c229729

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

Change-Id: I780dbee953862c6c49200f32d74fad66607a7474
tree: 327b5401bc82a39c0b65894f7a8c46cfc16f8b88
  1. core/
  2. services/
  3. tests/