[automerger skipped] Merge "Stop trying to get/set fields in FDE footer" into...

[automerger skipped] Merge "Stop trying to get/set fields in FDE footer" into tm-dev am: 87d60042 am: 95fc7bfb -s ours

am skip reason: Merged-In Iab7ba8d36890daa0645b2cedf33e4bd177a86b63 with SHA-1 661fdb3d is already in history

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

Change-Id: Ifcd42431cbeefe72cbce1a26d0c01195e9710a62