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

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

Change-Id: I0e69615ea0540bbcc8d859493f1b1ea21b409e90