Merge "Replace fields with getters in keepalive API" am: 8c5ae7e37f am: e07d038931

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

Change-Id: I1cf5e79229e5ffda0a77ac65b552ba0875b347f3