Merge "Delete {p,q}/android-4.9." am: bd9a5c2699 am: e1e103b8b5

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

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