Merge "[automerger skipped] [RESTRICT AUTOMERGE] Add import of...

Merge "[automerger skipped] [RESTRICT AUTOMERGE] Add import of MAX_APP_TRANSITION_DURATION am: 4236b3e8 -s ours am: 91e6b19c am: efa79024 -s ours am: f93bd9b0 am: f2d98eb8 am: d90f9d36" into rvc-qpr-dev-plus-aosp am: 88341b40 -s ours

am skip reason: subject contains skip directive

Change-Id: I22e33c97e25f4686c965be6bbe4a729aca198775