Merge changes from topic "railway_stub" am: 9ff27e5802

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

Change-Id: I67b78f551bc24d3fda6f8c55dca618ee62808906