[automerger skipped] Merge "Exposing flickerlib classes and layer tracing to sysui" am: e25075b2fb am: f19fcb5048 am: 8832611d4f
am: 3f0b334926 -s ours
am skip reason: change_id Ia0934ec7c2b9484fa6c85f5aa8d9b2e5e6f7dc0f with SHA1 be2bdb0311 is in history

Change-Id: I83a33ecfe6d7311552d2e79f74f9eceee3930936