[automerger skipped] Merge "Check orientation when retrieving FP location"...

[automerger skipped] Merge "Check orientation when retrieving FP location" into tm-qpr-dev am: 81b568b5 am: 4482bbd7 -s ours

am skip reason: Merged-In Iae49db8ef07046684d2a2c7293132b8f413341de with SHA-1 c4506b44 is already in history

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



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