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

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



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