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

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

Change-Id: Ie8fb5498c7f19605097e4515a14cfdecded2bcf7