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

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



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