Merge "Make DocsUI only log to device policy logger on R+" into rvc-dev am: f59ffe06b6 am: d456d3bf6a

Change-Id: Ifa80041390d194589848478262246fb996515212