Revert "resolve merge conflicts of a0c27243 to...

Revert "resolve merge conflicts of a0c27243 to qt-qpr1-dev-plus-aosp"

This reverts commit c91edfc6.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_qt-qpr1-dev-plus-aosp&target=test_suites_x86_64&lkgb=6282841&lkbb=6283012&fkbb=6283012, bug b/151187299

Change-Id: If10ccb38e2e3eb5aa13ec84ccf614577b5aeef2c
BUG: 151187299