Merge "Clean up old references to android.support in Activity and Fragment" into rvc-dev-plus-aosp am: 47029fe43d

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

Change-Id: I801d2fd7dc734f20b1a1f46daf555a6811540c8e