Bug: 113857483 Test: lunch taimen_xr-userdebug; builds; runs Change-Id: Ide43d77cb3d453586c7df7d4653ed5a23b3e4b21