[automerger skipped] Avoid unnecessary smaps logic during app compaction am:...

[automerger skipped] Avoid unnecessary smaps logic during app compaction am: 3536bf7b am: ace3b4b7 -s ours

am skip reason: Merged-In I165f211c2084676bc7872d190ffad14141f56ea8 with SHA-1 7e34869e is already in history

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

Change-Id: Icdfec61b5b26844141440901a8c2aba5a5669912