Merge "Rename to BASE_CLS_TO_INCLUDE, etc. as Android's inclusive language guidance" into udc-dev am: 5ea89d53 am: 9135149a

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



Change-Id: If3f9b9daf947333e41fe9393d5a90007ae07c851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>