Merge changes from topics "lockscreengesturelogger", "sbnp-notifentrymanager"...

Merge changes from topics "lockscreengesturelogger", "sbnp-notifentrymanager" into sc-v2-dev am: 756814b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15549417

Change-Id: I170c1a4ace6b3d05aadbeed828e4b83321a8210b