Merge "Revert "Check system manifest against frozen data."" am: d7c6f4f9 am:...

Merge "Revert "Check system manifest against frozen data."" am: d7c6f4f9 am: d6289145 am: 99b999c6

Original change: https://android-review.googlesource.com/c/platform/build/+/1467028

Change-Id: Ia54906518e9c6b368d81abcc3c02e22d5a618771