Revert submission

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=redfin-userdebug&lkgb=6020481&lkbb=6020533&fkbb=6020533, bug http://b/144824910.

Change-Id: I725961a3dba7b62f60ede6d74ce0363d2d1ba0a7