Merge "To fix the test case fail" into tm-qpr-dev am: 9f724554 am: f75442ff

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



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