Merge "Fix hearing aid appears wrong side after device reboot." into...

Merge "Fix hearing aid appears wrong side after device reboot." into tm-qpr-dev am: bf7c555c am: 7b083c72

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



Change-Id: I670bb5dc4dc1d801e92f520ea90695dc4ba1fe9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>