[automerger skipped] [RESTRICT AUTOMERGE] Revert "Don't force +1 for resource...

[automerger skipped] [RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution." am: a1409eda am: 9bb9222f -s ours am: f67926a7 -s ours

am skip reason: subject contains skip directive

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



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