Merge changes from topic "b215558965-wallet-falsing" into tm-mainline-prod am: 0d3b0f2d

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



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