This reverts commit 2db49e32. Reason for revert: Break aosp build on git_tm-dev-plus-aosp and downstream branches Change-Id: I0a86bf5e1e1f2ddf71308250f9110a9608ac2d8d Bug: 246355583