Merge "Test to ensure a toast doesn't affect app standby am: f351abf02f am: ccfc0ddf90" into nyc-mr1-dev-plus-aosp