Merge "[RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution.""...

Merge "[RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution."" into udc-dev am: b4f8ee63

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



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