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

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

Change-Id: I968842b29cbc5dfbcc9b904291dd9a0e67cf8606