Merge "[automerger skipped] Merge "Add test for getDeprecationTime and...

Merge "[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfe -s ours am: fdc5e782 -s ours am: d1954b63 -s ours" into rvc-qpr-dev-plus-aosp am: 62cad0ee -s ours

am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 fdd6d10d is in history

Change-Id: I6ffeefd7f1b28f25285e3750c3eb18c7e2642dfd