Merge "RESTRICT AUTOMERGE Avoid keyguardShowing check when watch is in ambient" into pie-cts-dev