[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: 3ace5835 am: 392affe4 -s ours

am skip reason: subject contains skip directive

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



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