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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ced5c0da482ba41de30e6f0d6f69e3607d71d41