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

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

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



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