Merge "Autogenerate tables of contents" am: 846e9c7f11 am: f4b9980a43 am: 38ea8f6690

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1833173

Change-Id: I73a18c8a5403642b08148fe847ac2d4a782b7400