[automerger skipped] Merge "Add test for getDeprecationTime and...
[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfe -s ours am: fdc5e782 -s ours
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 fdd6d10d is in history
Change-Id: Id9777ff826cedcbb3affb07a8c3f21a6af6a4ade