gesture_ambient_tap & auto_aewsome_battery Bug: 234570979 Test: TAP Change-Id: I7213cd67c4185f820b4dbe69469c827f74b5f37a