Merge "Don't force +1 for resource resolution." into udc-dev am: be0315f9

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



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