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

Merge "Updating the error message for clear understanding of Deprecated methods. Test: manual Bug: 234089071" into tm-dev am: 399d8e96 am: 06057b12

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



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