am 3d1a8864: am 1463840e: resolved conflicts for merge of f00356e6 to mnc-dev
am 3d1a8864: am 1463840e: resolved conflicts for merge of f00356e6 to mnc-dev

* commit '3d1a8864256aa9eaf752944bd25dd29673b11f72':
  Update api for leanback static dynamic shadow change

aosp-mirror/platform_frameworks_support,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,aosp-mirror/platform_frameworks_support,aosp-mirror/platform_frameworks_support,AndroidX/androidx,AndroidX/androidx,aosp-mirror/platform_frameworks_support,aosp-mirror/platform_frameworks_support,androidx/androidx,androidx/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx,AndroidX/androidx,AndroidX/androidx,androidx/androidx,androidx/androidx,AndroidX/androidx