Merge "Replace fields with getters in keepalive API" am: bc01e88edc am: 4c1a04c308

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

Change-Id: I1cf5e79229e5ffda0a77ac65b552ba0875b347f3