5/ Simplify subjects for layer tracing

This is a step closer to splitting flicker from the android codebase

Bug: 262369733
Test: atest FlickerLibTest
Change-Id: I2662fb10617dcfc45a9d47e35743d3318eded66c
8 files changed