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

Merge "[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfe am: 792debcc -s ours am: a2bff14c -s ours" into rvc-qpr-dev-plus-aosp am: b3df3194 -s ours

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

Change-Id: Ia621b593fceb9eae21e69ea633e1e6a90b3d0e03