Merge "Test specifying CERTIFICATE_NOT_{BEFORE,AFTER}" am: a2f63439c7 am: 4b6c4784be

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

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