Merge "Fix flipped CLIR message." am: 9472f9c00a am: fa379de5bc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I790ee31c42056513cdcfb59e880f731dbdb054ae