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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution."" into udc-dev am: b4f8ee63 -s ours am: 710d83c5 -s ours am: d3e5b92d -s ours

am skip reason: subject contains skip directive

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



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