Merge changes from topics "Deprecate-android-beam", "Dynamic_Default_Aid_Route" am: 65b05398 am: b881bccc am: b3252244 Change-Id: Ic6752d3d024bb34b8f02a0e1f0d30c7fd2c90595