Merge "Upon double registration just return instead of throwing exception"...

Merge "Upon double registration just return instead of throwing exception" into tm-qpr-dev am: a3be6a17 am: 4601dd22

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



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