Merge "Merge "Updating the error message for clear understanding of Deprecated...

Merge "Merge "Updating the error message for clear understanding of Deprecated methods. Test: manual Bug: 234089071" into tm-dev am: 399d8e96 am: d779fb84 am: d02f5999" into tm-qpr-dev-plus-aosp am: 07787806

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



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