[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 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: I0dbb5ed0ee15d50a146a4bd20e64909daf7e9987