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

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



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