Merge "Keep smartspace session object" into udc-dev am: 441e1e19 am: 9bdc2382

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



Change-Id: I18552999668b546a9c5a31d3096c7821d5235fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>