Merge changes from topic "hdmi_sam_shell_cmd" am: c46402e0eb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555095

Change-Id: Ia4f2fe5536215dda7a359a5015b4cb4992d46bf8