Merge "Clear application / system callback when the other one is set" into...

Merge "Clear application / system callback when the other one is set" into tm-dev am: 7d6a8ea0 am: 3b3b7305

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

Change-Id: Id51e41c953c62a58c95bbe15180ae484e4bc3af5