Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"" into ub-camera-fishlake