Merge "Fix bugs found during cts test." into tm-dev am: 761bb05aaa am: 68481de496
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17489934 Change-Id: I0b02771df9051be2aaf218d698b334f8584ab405 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: