[automerger skipped] Merge "Clean up old references to android.support in...

[automerger skipped] Merge "Clean up old references to android.support in Activity and Fragment" am: 2f3b72b8 am: 88df69af -s ours am: 498a8a1a -s ours am: be7217f9 -s ours

am skip reason: Change-Id Ia3c0aa2393e6d444af04e35446ac34d4e129c9aa with SHA-1 5d681da2 is in history

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

Change-Id: Ia061e0110f0f4067be2a9a1087b585ba9f73ba78