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

[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfe am: 792debcc am: 0a700cda am: 1c82287e -s ours am: 93ff9528 -s ours

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

Change-Id: Ia445804a6c9035ef1843a92cfef017caf245ef77