Merge "Fix "already registered" error" am: 0df5bbfe90 am: c4b00b8f57

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

Change-Id: Icc6dc6d5157c133097e67aad1837c3861fd02080