Merge changes from topic "railway_stub" am: 9ff27e5802 am: 8a24cce6d2 am: 0b5a0881f3 am: 11a5ed05ef

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

Change-Id: Ibfca187222fca09418668466c3e1b0c19b4d47d4