Merge changes from topic "base-state-api" into tm-qpr-dev am: d3955eaa am: a1fe0c4b

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



Change-Id: I1ffab9c02a210bf27c097c3d3776e64fea992aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>