Merge "Merge "Do not show a recording app more than once" into rvc-dev am: d514712c00 am: 6b0d3dfbe0" into rvc-d1-dev-plus-aosp am: 2fd4194680

Change-Id: I4b48a50ccd43c72d9df12a3fc84889f27fc78ca3