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

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

Change-Id: I73f6f89eb2d1255743d10c1ec1c92770845bdd63
tree: d386a52ad36d6396c90ed3c760038b5bbf0557c7
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING