tree b9d96d884509db4c97bf685d200b33c187e1a633
parent 4602588c88df38a9faab31f2072cf617ebc32b23
parent 1e05627ecc86fd397cf6cc2fc12b41dd30b5ab17
author Janis Danisevskis <jdanis@google.com> 1561684321 -0700
committer android-build-merger <android-build-merger@google.com> 1561684321 -0700

Merge changes from topic "gatekeeper_maintenance"
am: 1e05627ecc

Change-Id: I0ab186875fde3148ad18164226893c3494cb669b