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

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

Change-Id: Icdc075a521564adecb5e28887fb068e951b8b3a4