Merge "Merge "AOD: Pause FalsingManager prox sensor while showing AOD" into oc-dr1-dev am: 75c94b8788" into oc-dr1-dev-plus-aosp