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

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



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