[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 skip reason: Merged-In Ie6fb138edd20f02246ff2d3924497b1369d762f5 with SHA-1 a1409eda is already in history

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



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