Merge "Dump leanback info in aapt dump badging." into klp-modular-dev