Revert "resolve merge conflicts of ca342596..."

Revert submission 10740208-resolve-merge

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_qt-qpr1-dev-plus-aosp&target=aosp_taimen-userdebug&lkgb=6310008&lkbb=6310735&fkbb=6310101, bug b/151887221

Reverted Changes:
I311042a72:resolve merge conflicts of e6dddc99898fe5da4d24e6c...
I2d0615a6e:resolve merge conflicts of ca342596...

Bug: 151887221
Change-Id: Ifdac4bb18b2d1f751cc7ad9660f687709d2749d7