Merge "Merge "Do not show a recording app more than once" into rvc-dev am:...

Merge "Merge "Do not show a recording app more than once" into rvc-dev am: d514712c am: 6b0d3dfb" into rvc-d1-dev-plus-aosp am: 2fd41946 am: f9c5aa23

Change-Id: Id62365172b6bc42704eb131bfaab428a4307295f