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

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

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