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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c6b745354adb48f30cd0866095298b9d03f7cba