Merge "Clarify deprecation message" am: fb373b0613 am: 394cdfbbac

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2381012

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