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

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



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