Merge "Make sure no handlers have id = 0" into udc-dev am: 78ad5e0d am: 46fbe1fc am: be72b83c

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



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