Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev am: 8d10791f5b
am: 2b9ebbe093

Change-Id: I78490c8395111630429a73e4bda31cc155547c03