Merge "Rename to BASE_CLS_TO_INCLUDE, etc. as Android's inclusive language...

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

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



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