Merge "Merge "Add an overlay for photo preview" into rvc-dev am: b28dfc88...
Merge "Merge "Add an overlay for photo preview" into rvc-dev am: b28dfc88 am: 3b1927e9" into rvc-d1-dev-plus-aosp am: 09666e1e
Change-Id: I2aa9866cb38c9f7b8d5cb4acd0de36d051067102