[automerger skipped] Merge changes from topic "hdmi_sam_shell_cmd" am: c46402e0eb am: 8ecef70ef9 am: 10331099c0 -s ours
am skip reason: skip tag Change-Id I870850724a35315a0057e248182fba5568c79253 with SHA-1 3f313a10cc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555095
Change-Id: I7f3c00b6187e2e1d959cc06ff6846ad530caa379
This commit is contained in: