Merge "Migrates LOCKSCREEN and BOUNCER logs from TRON to Westworld" into...
Merge "Migrates LOCKSCREEN and BOUNCER logs from TRON to Westworld" into rvc-dev am: 71eaae37 am: 94b39b5b am: f961c06b am: 15ce10d0
Change-Id: Ifcf8efc61876b91eaeb826017483e24dee7757c0