Merge "DO NOT MERGE - Merge ab/7272582" am: 7eafd3aa43

Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1735997

Change-Id: I6425dddbb76865615016ec22db384bca6c572387