Merge "Remove the legacy getReplacingActivity() method from feature provider"...

Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704



Change-Id: Ib8ed3cab92913d7833ee45da09f0e8f6b889b598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>