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

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

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