Merge "Replace fields with getters in keepalive API" am: 445fd7e9d9 am: e5bc9e1aa1

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

Change-Id: I1cf5e79229e5ffda0a77ac65b552ba0875b347f3
tree: d5e0c6186576527b74690f829d96e62266ac497f
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING