[automerger skipped] Revert^2 "libandroidfw hardening for IncFs" am: 80094e39f9 am: ab46005fe8 am: c85f216055 -s ours

am skip reason: Change-Id I02d4890d181655dfd0a14c188468db512559d27b with SHA-1 db21f09a8e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id33d83cd4f80168b51023802a4aa0cfe082278eb