Merge "Remove complication id from entry mapping on removal." into tm-dev am: 574ae112 am: e75b2a40

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

Change-Id: I7557071ea5f13ea58d0ee72b1186b262478a9d37
Signed-off-by: Automerger Merge Worker