tree 6eae429f3128f98a317807f41d9ef6a0f4115c20
parent 8468178680ee596c70ee93f386550674cde75503
parent cdc4357efa007e9c7d2426ba7b3b4cc287ec3eac
author Evan Laird <evanlaird@google.com> 1573249726 -0800
committer android-build-merger <android-build-merger@google.com> 1573249726 -0800

[automerger skipped] Force FGS notifications to show for a minimum time am: 3692a6d231 -s ours am: 663d3d7991 -s ours am: 13be3108cb -s ours am: fead6f705d -s ours am: f7f67adcba -s ours
am: cdc4357efa -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 09843a687b is in history

Change-Id: I540758a0ee9c481130dc3cc20e5abf29f4d6165c